From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 9 Jul 2011 18:31:04 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=97d73f6dee8ef33921b896d24fcc4b87be2072b3;p=emacs.git

Merge from trunk.
---

97d73f6dee8ef33921b896d24fcc4b87be2072b3